New upstream version 2016.10
authorSimon McVittie <smcv@debian.org>
Fri, 9 Sep 2016 15:56:45 +0000 (16:56 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 9 Sep 2016 15:56:45 +0000 (16:56 +0100)

Trivial merge